Visual Studio Builds: Fix broadwayd Build

There is now a broadway-buffer.c source that needs to be built for this, so
add it into the projects.  Since crypt() is no longer used, don't include
crypt.c in the builds, and so clean up the projects a bit.

diff --git a/build/win32/vs10/broadwayd.vcxproj b/build/win32/vs10/broadwayd.vcxproj
index 35fc409a14827c6bdc4e7b9581f5fb794931f34a..c12137b1ccaaab19778e9df3ddda96bef52073c0 100644 (file)
--- a/build/win32/vs10/broadwayd.vcxproj
+++ b/build/win32/vs10/broadwayd.vcxproj
@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;..\crypt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -95,7 +95,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;..\crypt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -120,7 +120,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;..\crypt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -143,7 +143,7 @@
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;..\crypt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -163,8 +163,8 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\crypt\crypt3.c" />
     <ClCompile Include="..\..\..\gdk\broadway\broadwayd.c" />
+    <ClCompile Include="..\..\..\gdk\broadway\broadway-buffer.c" />
     <ClCompile Include="..\..\..\gdk\broadway\broadway-output.c" />
     <ClCompile Include="..\..\..\gdk\broadway\broadway-server.c" />
   </ItemGroup>

diff --git a/build/win32/vs10/broadwayd.vcxproj.filters b/build/win32/vs10/broadwayd.vcxproj.filters
index e4ff11509832155848fe29f190f0d27bf35f6d0a..96da7e972ee57e37e018baf9e834f789972b71ae 100644 (file)
--- a/build/win32/vs10/broadwayd.vcxproj.filters
+++ b/build/win32/vs10/broadwayd.vcxproj.filters
@@ -15,8 +15,8 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\crypt\crypt3.c"><Filter>Sources</Filter></ClCompile>
     <ClCompile Include="..\..\..\gdk\broadway\broadwayd.c"><Filter>Sources</Filter></ClCompile>
+    <ClCompile Include="..\..\..\gdk\broadway\broadway-buffer.c"><Filter>Sources</Filter></ClCompile>
     <ClCompile Include="..\..\..\gdk\broadway\broadway-output.c"><Filter>Sources</Filter></ClCompile>
     <ClCompile Include="..\..\..\gdk\broadway\broadway-server.c"><Filter>Sources</Filter></ClCompile>
   </ItemGroup>

diff --git a/build/win32/vs9/broadwayd.vcproj b/build/win32/vs9/broadwayd.vcproj
index bf31d1c6ecf97d47a99c5614bb16be0de3104e1d..1c345dd53a4b2fbdf680bb49c7e49c4be36fbaf0 100644 (file)
--- a/build/win32/vs9/broadwayd.vcproj
+++ b/build/win32/vs9/broadwayd.vcproj
@@ -31,7 +31,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway;..\crypt"
+                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
                                PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -62,7 +62,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
-                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway;..\crypt"
+                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
                                EnableIntrinsicFunctions="true"
                                PreprocessorDefinitions="$(GdkDefines)"
                                RuntimeLibrary="2"
@@ -95,7 +95,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway;..\crypt"
+                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
                                PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -127,7 +127,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
-                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway;..\crypt"
+                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
                                EnableIntrinsicFunctions="true"
                                PreprocessorDefinitions="$(GdkDefines)"
                                RuntimeLibrary="2"
@@ -157,8 +157,8 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
                </Filter>
-                       <File RelativePath="..\crypt\crypt3.c" />
                        <File RelativePath="..\..\..\gdk\broadway\broadwayd.c" />
+                       <File RelativePath="..\..\..\gdk\broadway\broadway-buffer.c" />
                        <File RelativePath="..\..\..\gdk\broadway\broadway-output.c" />
                        <File RelativePath="..\..\..\gdk\broadway\broadway-server.c" />
                <Filter